merge with xen-unstable.hg

diff --cc buildconfigs/linux-defconfig_xen0_ia64
index d8b5941ba4e3a4c2782435a498ac278f2485acbc,f616501246396df124d9c90df462a84d7d3d5732..08a32721aa0a8761f181f8264febb21a1a0d103c
--- 1/buildconfigs/linux-defconfig_xen0_ia64
--- 2/buildconfigs/linux-defconfig_xen0_ia64
+++ b/buildconfigs/linux-defconfig_xen0_ia64
@@@ -1526,7 -1528,8 +1526,8 @@@ CONFIG_XEN_PRIVCMD=
  CONFIG_XEN_BACKEND=y
  # CONFIG_XEN_PCIDEV_BACKEND is not set
  CONFIG_XEN_BLKDEV_BACKEND=y
 -CONFIG_XEN_NETDEV_BACKEND=y
 +CONFIG_XEN_XENBUS_DEV=y
+ # CONFIG_XEN_BLKDEV_TAP is not set
  # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
  CONFIG_XEN_NETDEV_LOOPBACK=y
  # CONFIG_XEN_TPMDEV_BACKEND is not set

diff --cc buildconfigs/linux-defconfig_xen_ia64
index ed9540304029789a3b10ec2527918be84456fcc9,2b921a1b6c4fe1819726121fdb1f0de1861163bc..566a70522ea1740afcf7242c7a0ff143d087c081
--- 1/buildconfigs/linux-defconfig_xen_ia64
--- 2/buildconfigs/linux-defconfig_xen_ia64
+++ b/buildconfigs/linux-defconfig_xen_ia64
@@@ -1532,7 -1534,8 +1532,8 @@@ CONFIG_XEN_PRIVCMD=
  CONFIG_XEN_BACKEND=y
  # CONFIG_XEN_PCIDEV_BACKEND is not set
  CONFIG_XEN_BLKDEV_BACKEND=y
 -CONFIG_XEN_NETDEV_BACKEND=y
 +CONFIG_XEN_XENBUS_DEV=y
+ # CONFIG_XEN_BLKDEV_TAP is not set
  # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
  CONFIG_XEN_NETDEV_LOOPBACK=y
  # CONFIG_XEN_TPMDEV_BACKEND is not set

diff --cc tools/libxc/Makefile
index 89e3264993d5f7c1d47d9cea7d2c0ed5205ee7e4,64ec867a1eb8da703e950c8d2eb5fc5d8790c9e8..8d27af904c10c6b53e5ddf63e7679734d707436f
--- 1/tools/libxc/Makefile
--- 2/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@@ -29,7 -29,9 +29,8 @@@ GUEST_SRCS-y :
  GUEST_SRCS-y += xc_load_bin.c
  GUEST_SRCS-y += xc_load_elf.c
  GUEST_SRCS-y += xg_private.c
 -GUEST_SRCS-$(CONFIG_IA64) += xc_ia64_stubs.c xc_linux_build.c
+ GUEST_SRCS-$(CONFIG_POWERPC) += xc_ppc_linux_build.c
+ GUEST_SRCS-$(CONFIG_X86) += xc_linux_build.c
  GUEST_SRCS-$(CONFIG_MIGRATE) += xc_linux_restore.c xc_linux_save.c
  GUEST_SRCS-$(CONFIG_HVM) += xc_hvm_build.c
  

diff --cc tools/libxc/xenctrl.h
Simple merge